Skip to content

efi: Extend install() to support usr/lib/efi #992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

efi: Extend install() to support usr/lib/efi #992

wants to merge 3 commits into from
+105 −36

Conversation

HuijingHei
Copy link
Member

No description provided.

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Aug 31, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@HuijingHei HuijingHei force-pushed the step2-install-from-usr branch 5 times, most recently from 2c9e284 to 9ead61b Compare September 4, 2025 10:19
@HuijingHei HuijingHei force-pushed the step2-install-from-usr branch from 9ead61b to 60160c0 Compare September 7, 2025 12:28
@HuijingHei HuijingHei marked this pull request as ready for review September 7, 2025 12:40
@HuijingHei HuijingHei force-pushed the step2-install-from-usr branch 2 times, most recently from 84859b4 to f5a32fc Compare September 8, 2025 08:12
@HuijingHei
Copy link
Member Author

HuijingHei commented Sep 8, 2025 •
edited
Loading

Test with this patch, the following is the new bootupd-state.json content, and the filetree path is grub2/1:2.12-41.fc44/EFI/fedora/grubx64.efi instead of old fedora/grubx64.efi

[root@cosa-devsh core]# cat /boot/bootupd-state.json | jq
{
  "installed": {
    "BIOS": {
      "meta": {
        "timestamp": "2025-08-20T15:58:45Z",
        "version": "grub2-tools-1:2.12-41.fc44.x86_64",
        "versions": [
          {
            "name": "grub2",
            "rpm_evr": "1:2.12-41.fc44"
          }
        ]
      },
      "filetree": null,
      "adopted-from": null
    },
    "EFI": {
      "meta": {
        "timestamp": "2025-09-08T09:29:28.806885596Z",
        "version": "grub2-1:2.12-41.fc44,shim-15.8-5",
        "versions": [
          {
            "name": "grub2",
            "rpm_evr": "1:2.12-41.fc44"
          },
          {
            "name": "shim",
            "rpm_evr": "15.8-5"
          }
        ]
      },
      "filetree": {
        "children": {
          "grub2/1:2.12-41.fc44/EFI/fedora/grubx64.efi": {
            "size": 4046144,
            "sha512": "sha512:47f341bcbe521b907a56d480a3f3e9e92c8358012244a34a092e270f63f5970ccafcedc8c0d22fa99fcb462d76926412f2ebaec13b9a53c95a4036e5fe559ebf"
          },
          "shim/15.8-5/EFI/BOOT/BOOTX64.EFI": {
            "size": 949424,
            "sha512": "sha512:cc23d8c3cb2dcf749075268b77eb796fb430182cbbc04171ded14d43e32b4a5cdeeb1a08666ee0e288bd37d63f657a9af5e7f2012dd70694d11212d705c60b42"
          },
          "shim/15.8-5/EFI/BOOT/fbx64.efi": {
            "size": 87816,
            "sha512": "sha512:e62970bb6fa9ae508c66571f7288c54a6cba2096c0ac4479aab575196c1c4e3dbc9434c4138ec6ab7876acb541143c166376637569dde17b1b4ed065c40de844"
          },
          "shim/15.8-5/EFI/fedora/BOOTX64.CSV": {
            "size": 110,
            "sha512": "sha512:0c29b8ae73171ef683ba690069c1bae711e130a084a81169af33a83dfbae4e07d909c2482dbe89a96ab26e171f17c53f1de8cb13d558bc1535412ff8accf253f"
          },
          "shim/15.8-5/EFI/fedora/mmx64.efi": {
            "size": 848080,
            "sha512": "sha512:1c461e8056228ce0cb9905756aca7fc5e4eed9af2b18b4a09a67050f28a05421b8e42176a4b973aed541fb2a7796f7ee3a5026c5ed4826382a59aecd9929a3d7"
          },
          "shim/15.8-5/EFI/fedora/shim.efi": {
            "size": 949424,
            "sha512": "sha512:cc23d8c3cb2dcf749075268b77eb796fb430182cbbc04171ded14d43e32b4a5cdeeb1a08666ee0e288bd37d63f657a9af5e7f2012dd70694d11212d705c60b42"
          },
          "shim/15.8-5/EFI/fedora/shimx64.efi": {
            "size": 949424,
            "sha512": "sha512:cc23d8c3cb2dcf749075268b77eb796fb430182cbbc04171ded14d43e32b4a5cdeeb1a08666ee0e288bd37d63f657a9af5e7f2012dd70694d11212d705c60b42"
          }
        }
      },
      "adopted-from": null
    }
  },
  "pending": null,
  "static-configs": {
    "timestamp": "2025-09-08T09:27:05.691Z",
    "version": "0.2.29",
    "versions": null
  }
}

@HuijingHei HuijingHei force-pushed the step2-install-from-usr branch 2 times, most recently from 3dd909e to 798f2a2 Compare September 10, 2025 03:33
@HuijingHei
Copy link
Member Author

HuijingHei commented Sep 10, 2025 •
edited
Loading

Hold on, the change in the filetree path grub2/1:2.12-41.fc44/EFI/fedora/grubx64.efi (from /boot/bootupd-state.json) will make the update tricky, will do more testing.

Edit:

For example, if update to new that supports /usr/lib/efi, the diff is like the following, for me this seems acceptable for the new change.

[src/efi.rs:467:9] &diff = FileTreeDiff {
    additions: {
        "grub2/1:2.12-42.fc44/EFI/fedora/grubx64.efi",
        "shim/15.8-5/EFI/BOOT/fbx64.efi",
        "shim/15.8-5/EFI/fedora/shim.efi",
        "shim/15.8-5/EFI/BOOT/BOOTX64.EFI",
        "shim/15.8-5/EFI/fedora/BOOTX64.CSV",
        "shim/15.8-5/EFI/fedora/mmx64.efi",
        "shim/15.8-5/EFI/fedora/shimx64.efi",
    },
    removals: {
        "fedora/grubx64.efi",
        "fedora/shim.efi",
        "fedora/BOOTX64.CSV",
        "BOOT/fbx64.efi",
        "fedora/mmx64.efi",
        "BOOT/BOOTX64.EFI",
        "fedora/shimx64.efi",
    },
    changes: {},
}

If there is update (from shim-15.8-5 to shim-15.8-6), and the result is the following, seems we even do not need to compare the FileMetadata because the path is different. Is this looks good or should we keep the path without shim/15.8-6/EFI like before?

[src/efi.rs:467:9] &diff = FileTreeDiff {
    additions: {
        "shim/15.8-6/EFI/BOOT/BOOTX64.EFI",
        "shim/15.8-6/EFI/BOOT/fbx64.efi",
        "shim/15.8-6/EFI/fedora/mmx64.efi",
        "shim/15.8-6/EFI/fedora/shimx64.efi",
        "shim/15.8-6/EFI/fedora/shim.efi",
        "shim/15.8-6/EFI/fedora/BOOTX64.CSV",
    },
    removals: {
        "shim/15.8-5/EFI/BOOT/BOOTX64.EFI",
        "shim/15.8-5/EFI/fedora/mmx64.efi",
        "shim/15.8-5/EFI/fedora/shim.efi",
        "shim/15.8-5/EFI/fedora/BOOTX64.CSV",
        "shim/15.8-5/EFI/fedora/shimx64.efi",
        "shim/15.8-5/EFI/BOOT/fbx64.efi",
    },
    changes: {},
}

@HuijingHei HuijingHei force-pushed the step2-install-from-usr branch from 798f2a2 to fbb98bc Compare September 15, 2025 02:30
@HuijingHei HuijingHei marked this pull request as draft September 15, 2025 02:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
do-not-merge/work-in-progress
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@HuijingHei